merge with xen-unstable.hg

diff --cc .hgignore
Simple merge

diff --cc xen/include/public/arch-ia64.h
index 76cb70fb1a1273898c4f87087cc16641aec931b6,43ca979cf6e79cad57e375f62709673a60ea09a4..7a779d6005127dcc964af71ab9081f7a71dc4f3b
--- 1/xen/include/public/arch-ia64.h
--- 2/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@@ -62,14 -68,8 +68,12 @@@ typedef unsigned long xen_pfn_t
  /* WARNING: before changing this, check that shared_info fits on a page */
  #define MAX_VIRT_CPUS 64
  
 +/* IO ports location for PV.  */
 +#define IO_PORTS_PADDR          0x00000ffffc000000UL
 +#define IO_PORTS_SIZE           0x0000000004000000UL
 +
  #ifndef __ASSEMBLY__
  
- #define __anonymous_union __extension__ union
- 
  typedef unsigned long xen_ulong_t;
  
  #ifdef __XEN_TOOLS__